Don't activate the combo if we're in the midst of changing folders.

Wed Mar  3 16:06:03 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb):
        Don't activate the combo if we're in the midst of changing
        folders.

diff --git a/ChangeLog b/ChangeLog
index 27ab8bb86861d1d999dee9804dd8265f66862dea..82cace02e0a0eb9ab9d505ab51f94225c57fd9b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar  3 16:06:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb):
+       Don't activate the combo if we're in the midst of changing
+       folders.
+
 2004-03-03  Mark McLoughlin  <mark@skynet.ie>
 
        * tests/testsocket_common.c: (print_hello): don't try and store

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 27ab8bb86861d1d999dee9804dd8265f66862dea..82cace02e0a0eb9ab9d505ab51f94225c57fd9b8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Mar  3 16:06:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb):
+       Don't activate the combo if we're in the midst of changing
+       folders.
+
 2004-03-03  Mark McLoughlin  <mark@skynet.ie>
 
        * tests/testsocket_common.c: (print_hello): don't try and store

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 27ab8bb86861d1d999dee9804dd8265f66862dea..82cace02e0a0eb9ab9d505ab51f94225c57fd9b8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Mar  3 16:06:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb):
+       Don't activate the combo if we're in the midst of changing
+       folders.
+
 2004-03-03  Mark McLoughlin  <mark@skynet.ie>
 
        * tests/testsocket_common.c: (print_hello): don't try and store

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 27ab8bb86861d1d999dee9804dd8265f66862dea..82cace02e0a0eb9ab9d505ab51f94225c57fd9b8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Mar  3 16:06:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb):
+       Don't activate the combo if we're in the midst of changing
+       folders.
+
 2004-03-03  Mark McLoughlin  <mark@skynet.ie>
 
        * tests/testsocket_common.c: (print_hello): don't try and store

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 27ab8bb86861d1d999dee9804dd8265f66862dea..82cace02e0a0eb9ab9d505ab51f94225c57fd9b8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Mar  3 16:06:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (save_folder_combo_changed_cb):
+       Don't activate the combo if we're in the midst of changing
+       folders.
+
 2004-03-03  Mark McLoughlin  <mark@skynet.ie>
 
        * tests/testsocket_common.c: (print_hello): don't try and store

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 8502230202b869fd42c245694015c9ee8b20eeb1..eaecbc962e23f1afd26c4e712346aefa21dfeb01 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1989,6 +1989,9 @@ save_folder_combo_changed_cb (GtkComboBox           *combo,
 {
   int active;
 
+  if (impl->changing_folder)
+    return;
+
   active = gtk_combo_box_get_active (combo);
   if (active == -1)
     return;